Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Sep 2011 14:51:44 +0000 (07:51 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Sep 2011 14:51:44 +0000 (07:51 -0700)
commitd306c7c86f14761297561ece36c76009b9b44e31
tree279d46c478291bc9aab7cc82256fc5614ff797b3
parent1e1494059f5d06b06303870ac39911fb6026cb98
parent118de803e560e8db3ccdfe01542045dad3ffb456
Merge from trunk.